Skip to content

charts,salt: Bump prometheus-adapter chart to 5.3.0#4825

Merged
bert-e merged 2 commits intodevelopment/133.0from
improvement/bump-prometheus-adapter-5.3.0
Mar 19, 2026
Merged

charts,salt: Bump prometheus-adapter chart to 5.3.0#4825
bert-e merged 2 commits intodevelopment/133.0from
improvement/bump-prometheus-adapter-5.3.0

Conversation

@ezekiel-alexrod
Copy link
Copy Markdown
Contributor

@ezekiel-alexrod ezekiel-alexrod commented Mar 18, 2026 •
edited
Loading

Notable changes:

  • Remove deprecated PodSecurityPolicy support
  • Use policy/v1 for PodDisruptionBudget (requires Kubernetes >= 1.21)
  • Add revisionHistoryLimit and unhealthyPodEvictionPolicy options

Image version unchanged (v0.12.0).

SLS chart updated with ./doit.sh codegen

Closes: MK8S-104

@ezekiel-alexrod ezekiel-alexrod requested a review from a team as a code owner March 18, 2026 08:37
@bert-e
Copy link
Copy Markdown
Contributor

bert-e commented Mar 18, 2026

Hello ezekiel-alexrod,

My role is to assist you with the merge of this
pull request. Please type @bert-e help to get information
on this process, or consult the user documentation.

Available options
name description privileged authored
/after_pull_request Wait for the given pull request id to be merged before continuing with the current one.
/bypass_author_approval Bypass the pull request author's approval ⭐
/bypass_build_status Bypass the build and test status ⭐
/bypass_commit_size Bypass the check on the size of the changeset TBA ⭐
/bypass_incompatible_branch Bypass the check on the source branch prefix ⭐
/bypass_jira_check Bypass the Jira issue check ⭐
/bypass_peer_approval Bypass the pull request peers' approval ⭐
/bypass_leader_approval Bypass the pull request leaders' approval ⭐
/approve Instruct Bert-E that the author has approved the pull request. ✍️
/create_pull_requests Allow the creation of integration pull requests.
/create_integration_branches Allow the creation of integration branches.
/no_octopus Prevent Wall-E from doing any octopus merge and use multiple consecutive merge instead
/unanimity Change review acceptance criteria from one reviewer at least to all reviewers
/wait Instruct Bert-E not to run until further notice.
Available commands
name description privileged
/help Print Bert-E's manual in the pull request.
/status Print Bert-E's current status in the pull request TBA
/clear Remove all comments from Bert-E from the history TBA
/retry Re-start a fresh build TBA
/build Re-start a fresh build TBA
/force_reset Delete integration branches & pull requests, and restart merge process from the beginning.
/reset Try to remove integration branches unless there are commits on them which do not appear on the source branch.

Status report is not available.

@bert-e
Copy link
Copy Markdown
Contributor

bert-e commented Mar 18, 2026

Waiting for approval

The following approvals are needed before I can proceed with the merge:

  • the author

  • 2 peers

Peer approvals must include at least 1 approval from the following list:

@ezekiel-alexrod
charts,salt: Bump prometheus-adapter chart to 5.3.0
45b2276 
Notable changes:
- Remove deprecated PodSecurityPolicy support
- Use policy/v1 for PodDisruptionBudget (requires Kubernetes >= 1.21)
- Add revisionHistoryLimit and unhealthyPodEvictionPolicy options

Image version unchanged (v0.12.0).

SLS chart updated with ./doit.sh codegen

Closes: MK8S-104
@ezekiel-alexrod ezekiel-alexrod force-pushed the improvement/bump-prometheus-adapter-5.3.0 branch from 9e2c9bc to 45b2276 Compare March 18, 2026 08:38
TeddyAndrieux
TeddyAndrieux previously approved these changes Mar 18, 2026
View reviewed changes
@bert-e
Copy link
Copy Markdown
Contributor

bert-e commented Mar 18, 2026

Waiting for approval

The following approvals are needed before I can proceed with the merge:

  • the author

  • 2 peers

Peer approvals must include at least 1 approval from the following list:

@ezekiel-alexrod
Copy link
Copy Markdown
Contributor Author

ezekiel-alexrod commented Mar 18, 2026

/approve

@bert-e
Copy link
Copy Markdown
Contributor

bert-e commented Mar 18, 2026

Waiting for approval

The following approvals are needed before I can proceed with the merge:

  • the author

  • 2 peers

Peer approvals must include at least 1 approval from the following list:

The following options are set: approve

vdaviot
vdaviot previously approved these changes Mar 18, 2026
View reviewed changes
@bert-e
Copy link
Copy Markdown
Contributor

bert-e commented Mar 18, 2026

Conflict with a changeset in the queue

The changeset in this pull request conflicts with another changeset
already in the queue. Please wait for the current queue to merge into
the development branch. The conflict will then appear in this pull
request and can be sorted on the feature branch directly.

This changeset has not been added to the queue.

The following options are set: approve

@ezekiel-alexrod
Copy link
Copy Markdown
Contributor Author

ezekiel-alexrod commented Mar 18, 2026

🤖

@bert-e
Copy link
Copy Markdown
Contributor

bert-e commented Mar 18, 2026

Conflict

There is a conflict between your branch improvement/bump-prometheus-adapter-5.3.0 and the
destination branch development/133.0.

Please resolve the conflict on the feature branch (improvement/bump-prometheus-adapter-5.3.0).

git fetch && \
git checkout origin/improvement/bump-prometheus-adapter-5.3.0 && \
git merge origin/development/133.0

Resolve merge conflicts and commit

git push origin HEAD:improvement/bump-prometheus-adapter-5.3.0

The following options are set: approve

@ezekiel-alexrod ezekiel-alexrod dismissed stale reviews from vdaviot and TeddyAndrieux via 4cb7dba March 18, 2026 16:57
@bert-e
Copy link
Copy Markdown
Contributor

bert-e commented Mar 18, 2026

Waiting for approval

The following approvals are needed before I can proceed with the merge:

  • the author

  • 2 peers

Peer approvals must include at least 1 approval from the following list:

The following options are set: approve

@bert-e
Copy link
Copy Markdown
Contributor

bert-e commented Mar 19, 2026

Waiting for approval

The following approvals are needed before I can proceed with the merge:

  • the author

  • 2 peers

Peer approvals must include at least 1 approval from the following list:

The following options are set: approve

@bert-e
Copy link
Copy Markdown
Contributor

bert-e commented Mar 19, 2026

I have successfully merged the changeset of this pull request
into targetted development branches:

  • ✔️ development/133.0

The following branches have NOT changed:

  • development/123.0
  • development/124.0
  • development/124.1
  • development/125.0
  • development/126.0
  • development/127.0
  • development/128.0
  • development/129.0
  • development/130.0
  • development/131.0
  • development/132.0
  • development/2.0
  • development/2.1
  • development/2.10
  • development/2.11
  • development/2.2
  • development/2.3
  • development/2.4
  • development/2.5
  • development/2.6
  • development/2.7
  • development/2.8
  • development/2.9

Please check the status of the associated issue None.

Goodbye ezekiel-alexrod.

The following options are set: approve

@bert-e bert-e merged commit 4cb7dba into development/133.0 Mar 19, 2026
54 of 55 checks passed
@bert-e bert-e deleted the improvement/bump-prometheus-adapter-5.3.0 branch March 19, 2026 08:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@vdaviot vdaviot vdaviot approved these changes

@TeddyAndrieux TeddyAndrieux TeddyAndrieux approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@ezekiel-alexrod @bert-e @vdaviot @TeddyAndrieux